[XEN][POWERPC] Enable gcc -Wshadow and fix the warnings

As suggested by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --git a/xen/arch/powerpc/Makefile b/xen/arch/powerpc/Makefile
index 489b1686320ba3e15f32925f372f605311a020e1..c16cd1977f27b5d869dde0033e404f23ea556034 100644 (file)
--- a/xen/arch/powerpc/Makefile
+++ b/xen/arch/powerpc/Makefile
@@ -47,6 +47,7 @@ obj-y += elf32.o
 # These are extra warnings like for the arch/ppc directory but may not
 # allow the rest of the tree to build.
 PPC_C_WARNINGS += -Wundef -Wmissing-prototypes -Wmissing-declarations
+PPC_C_WARNINGS += -Wshadow
 CFLAGS += $(PPC_C_WARNINGS)
 
 LINK=0x400000

diff --git a/xen/arch/powerpc/mpic.c b/xen/arch/powerpc/mpic.c
index b2a9ca3a9a369a442d0e7a1122fe034713423019..ca777561e4d1d22b1f66f454e4dfc5fbdf25c05b 100644 (file)
--- a/xen/arch/powerpc/mpic.c
+++ b/xen/arch/powerpc/mpic.c
@@ -498,10 +498,10 @@ static void mpic_enable_irq(unsigned int irq)
 
 #ifdef CONFIG_MPIC_BROKEN_U3
        if (mpic->flags & MPIC_BROKEN_U3) {
-               unsigned int src = irq - mpic->irq_offset;
-               if (mpic_is_ht_interrupt(mpic, src) &&
+               unsigned int bsrc = irq - mpic->irq_offset;
+               if (mpic_is_ht_interrupt(mpic, bsrc) &&
                    (irq_desc[irq].status & IRQ_LEVEL))
-                       mpic_ht_end_irq(mpic, src);
+                       mpic_ht_end_irq(mpic, bsrc);
        }
 #endif /* CONFIG_MPIC_BROKEN_U3 */
 }

diff --git a/xen/arch/powerpc/ofd_fixup.c b/xen/arch/powerpc/ofd_fixup.c
index d18ff1808c72e2c4491a4e8addb9cbbec0ee5534..0da3387587327360aae8ad708a7462ebaf16b748 100644 (file)
--- a/xen/arch/powerpc/ofd_fixup.c
+++ b/xen/arch/powerpc/ofd_fixup.c
@@ -497,8 +497,8 @@ int ofd_dom0_fixup(struct domain *d, ulong mem, start_info_t *si, ulong eoload)
     r = ofd_prop_add(m, n, "ibm,partition-no", &did, sizeof(did));
     ASSERT( r > 0 );
 
-    const char dom0[] = "dom0";
-    r = ofd_prop_add(m, n, "ibm,partition-name", dom0, sizeof (dom0));
+    const char d0[] = "dom0";
+    r = ofd_prop_add(m, n, "ibm,partition-name", d0, sizeof (d0));
     ASSERT( r > 0 );